From 4a22a4ce1e7820dee4ab4cbf573df252b972c6ad Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 20 Aug 2009 22:26:16 +0100 Subject: [PATCH] libxenguest: Fix libbz2/liblzma dependency computation. 1. Create an empty dep file if neither lib is installed 2. Forcibly disable support for libs if building minios Signed-off-by: Keir Fraser --- tools/libxc/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 2adf8e689d..5693025e60 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -151,10 +151,14 @@ libxenguest.so: libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR) ln -sf $< $@ +ifeq ($(CONFIG_MiniOS),y) +.zlib.deps: + echo >$@ +else .zlib.deps: @(set -e; \ . ../check/funcs.sh; \ - rm -f $@.new; \ + echo >$@.new; \ if has_header bzlib.h; then \ echo "-DHAVE_BZLIB" >>$@.new; \ echo "-lbz2" >>$@.new; \ @@ -166,6 +170,7 @@ libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR) echo " - LZMA decompression supported"; \ fi; \ mv $@.new $@) +endif xc_dom_bzimageloader.o: .zlib.deps xc_dom_bzimageloader.o: CFLAGS += $(shell grep D .zlib.deps) -- 2.30.2